Typography fix?
4 changed files with 40 additions and 22 deletions
+ 3
- 14
app/assets/stylesheets/avalanche_theme.css.less
@@ -2,6 +2,7 @@ |
||
| 2 | 2 |
// ------------------------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
@import "avl2_theme/colors.less"; |
| 5 |
+@import "avl2_theme/typography.less"; |
|
| 5 | 6 |
//@import "avl2_theme/buttons.less"; |
| 6 | 7 |
//@import "avl2_theme/forms.less"; |
| 7 | 8 |
//@import "avl2_theme/panel.less"; |
@@ -54,13 +55,7 @@ html, body {
|
||
| 54 | 55 |
} |
| 55 | 56 |
|
| 56 | 57 |
.page-header h1 {
|
| 57 |
- font-family: 'Helvetica-LightOblique', 'Helvetica Light Oblique', "Helvetica Neue"; |
|
| 58 |
- font-style: italic; |
|
| 59 |
- font-weight: 300; |
|
| 60 |
- text-transform: uppercase; |
|
| 61 |
- font-size: 64px; |
|
| 62 |
- color: #1D1D26; |
|
| 63 |
- line-height: 77px; |
|
| 58 |
+ .theme-header(); |
|
| 64 | 59 |
margin-bottom: 0px; |
| 65 | 60 |
} |
| 66 | 61 |
|
@@ -80,13 +75,7 @@ html, body {
|
||
| 80 | 75 |
} |
| 81 | 76 |
|
| 82 | 77 |
.page-header-type small {
|
| 83 |
- font-family: Avenir-MediumOblique; |
|
| 84 |
- font-size: 18px; |
|
| 85 |
- color: #1D1D26; |
|
| 86 |
- line-height: 25px; |
|
| 87 |
- text-transform: uppercase; |
|
| 88 |
- font-style: italic; |
|
| 89 |
- font-weight: 200; |
|
| 78 |
+ .theme-pre-header; |
|
| 90 | 79 |
} |
| 91 | 80 |
|
| 92 | 81 |
.page-header h1 .btn {
|
+ 26
- 0
app/assets/stylesheets/avl2_theme/typography.less
@@ -1,5 +1,31 @@ |
||
| 1 | 1 |
// Typographic Styles |
| 2 | 2 |
|
| 3 |
+@font-face {
|
|
| 4 |
+ font-family: 'Open Sans', sans-serif; |
|
| 5 |
+ @import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,600italic,300); |
|
| 6 |
+} |
|
| 7 |
+ |
|
| 8 |
+.theme-header() {
|
|
| 9 |
+ font-family: "Open Sans", "Helvetica-LightOblique", "Helvetica Light Oblique", "Helvetica Neue", "sans-serif"; |
|
| 10 |
+ font-weight: 300; |
|
| 11 |
+ font-style: italic; |
|
| 12 |
+ text-transform: uppercase; |
|
| 13 |
+ font-size: 64px; |
|
| 14 |
+ color: #1D1D26; |
|
| 15 |
+ line-height: 77px; |
|
| 16 |
+} |
|
| 17 |
+.theme-pre-header(){
|
|
| 18 |
+ font-family: "Open Sans", "Helvetica-LightOblique", "Helvetica Light Oblique", "Helvetica Neue", "sans-serif"; |
|
| 19 |
+ font-size: 18px; |
|
| 20 |
+ color: #1D1D26; |
|
| 21 |
+ line-height: 25px; |
|
| 22 |
+ text-transform: uppercase; |
|
| 23 |
+ font-style: italic; |
|
| 24 |
+ font-weight: 600; |
|
| 25 |
+} |
|
| 26 |
+ |
|
| 27 |
+ |
|
| 28 |
+ |
|
| 3 | 29 |
.small-text {
|
| 4 | 30 |
font-family: Helvetica-LightOblique; |
| 5 | 31 |
font-size: 14px; |
+ 0
- 7
app/assets/stylesheets/test.css
@@ -1,7 +0,0 @@ |
||
| 1 |
-* { text-transform: none !important }
|
|
| 2 |
- |
|
| 3 |
-input[type="file"] {
|
|
| 4 |
- width: 1px; |
|
| 5 |
- height: 1px; |
|
| 6 |
- float: left; |
|
| 7 |
-} |
+ 11
- 1
app/views/layouts/application.html.erb
@@ -36,7 +36,17 @@ |
||
| 36 | 36 |
|
| 37 | 37 |
<%= javascript_include_tag "application" %> |
| 38 | 38 |
|
| 39 |
- <%= stylesheet_link_tag "test" if Rails.env.test? %> |
|
| 39 |
+ <% if Rails.env.test? %> |
|
| 40 |
+ <style> |
|
| 41 |
+ * { text-transform: none !important }
|
|
| 42 |
+ |
|
| 43 |
+ input[type="file"] {
|
|
| 44 |
+ width: 1px; |
|
| 45 |
+ height: 1px; |
|
| 46 |
+ float: left; |
|
| 47 |
+ } |
|
| 48 |
+ </style> |
|
| 49 |
+ <% end %> |
|
| 40 | 50 |
|
| 41 | 51 |
</head> |
| 42 | 52 |
<body> |